How-to articles, tricks, and solutions about MERGE STRATEGIES
How to Automatically Resolve Git Merge Conflicts in Favor of Any Side
Read this tutorial and solve the problem of resolving git merge conflicts in favor of pulled changes. Get overall understanding of Git merge strategies.